From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Thu, 27 Apr 2006 18:19:59 +0000 (+0100)
Subject: Fix memory_op hypercall mlock/munlock wrapping after the
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16108^2~65
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=d6f69f0e01675ca2237060cba8396d925f110d6b;p=xen.git

Fix memory_op hypercall mlock/munlock wrapping after the
GET/SET_XEN_GUEST_HANDLE patch.

Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index 989743cf3f..b507a2b794 100644
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -226,7 +226,7 @@ int xc_memory_op(int xc_handle,
             PERROR("Could not mlock");
             goto out1;
         }
-        GET_XEN_GUEST_HANDLE(extent_start, reservation->extent_start);
+        GET_XEN_GUEST_HANDLE(extent_start, xmml->extent_start);
         if ( mlock(extent_start,
                    xmml->max_extents * sizeof(unsigned long)) != 0 )
         {
@@ -281,7 +281,7 @@ int xc_memory_op(int xc_handle,
         break;
     case XENMEM_machphys_mfn_list:
         safe_munlock(xmml, sizeof(*xmml));
-        GET_XEN_GUEST_HANDLE(extent_start, reservation->extent_start);
+        GET_XEN_GUEST_HANDLE(extent_start, xmml->extent_start);
         safe_munlock(extent_start,
                      xmml->max_extents * sizeof(unsigned long));
         break;